From 958916d878411d8b0687a6729abd15cccf6735d4 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 28 Oct 2014 08:32:54 -0700 Subject: [PATCH] Update curl-rust to handle SSL config for linuxes Right now the cargo built on the snapshot bot isn't able to talk to the registry due to failing to validate the SSL certificate. This is likely due to the certificate path being hardcoded to something that's compatible with CentOS (which isn't what I'm running locally). I've modified curl-rust to use openssl-static-sys to probe the system for where certificates are located and inform handles by default about the found locations. This is the same strategy that git2-rs uses to inform openssl about where the certificates are located. --- Cargo.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 248eddf3d..3d4115e62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,17 +18,18 @@ dependencies = [ [[package]] name = "curl" version = "0.0.1" -source = "git+https://github.com/alexcrichton/curl-rust?ref=bundle#36b015de91daf6310227cec04ef30acf5929dfb6" +source = "git+https://github.com/alexcrichton/curl-rust?ref=bundle#1098e4dd3b89b168b412dfeaba033e41796ea794" dependencies = [ "curl-sys 0.0.1 (git+https://github.com/alexcrichton/curl-rust?ref=bundle)", "link-config 0.0.1 (git+https://github.com/alexcrichton/link-config)", + "openssl-static-sys 0.0.1 (git+https://github.com/alexcrichton/openssl-static-sys)", "url 0.1.0 (git+https://github.com/servo/rust-url)", ] [[package]] name = "curl-sys" version = "0.0.1" -source = "git+https://github.com/alexcrichton/curl-rust?ref=bundle#36b015de91daf6310227cec04ef30acf5929dfb6" +source = "git+https://github.com/alexcrichton/curl-rust?ref=bundle#1098e4dd3b89b168b412dfeaba033e41796ea794" [[package]] name = "docopt" @@ -87,7 +88,7 @@ source = "git+https://github.com/alexcrichton/link-config#0202cc8aa74a7b0bdbaef4 [[package]] name = "openssl-static-sys" version = "0.0.1" -source = "git+https://github.com/alexcrichton/openssl-static-sys#d218fa63aabefb3ac56a44985e2df8a2dc932450" +source = "git+https://github.com/alexcrichton/openssl-static-sys#2e1c50a7f35ef52ce38dbd405a175b6dccc0ebad" [[package]] name = "registry" -- 2.30.2